From 38457bf1f8eca8ce2c5636a7a8340d389266b118 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 26 Nov 2009 11:30:42 +0000 Subject: [PATCH] Revert 20505:44ea369eefc1 --- xen/arch/x86/mm/p2m.c | 6 ------ xen/arch/x86/mm/shadow/common.c | 7 ------- 2 files changed, 13 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e916d46faf..aebfdd18a6 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1221,12 +1221,6 @@ p2m_gfn_to_mfn(struct domain *d, unsigned long gfn, p2m_type_t *t, ASSERT(paging_mode_translate(d)); - if ( unlikely(d->is_dying) ) - { - *t = p2m_invalid; - return _mfn(INVALID_MFN); - } - /* XXX This is for compatibility with the old model, where anything not * XXX marked as RAM was considered to be emulated MMIO space. * XXX Once we start explicitly registering MMIO regions in the p2m diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index f6cc319f86..94457a3281 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2171,7 +2171,6 @@ static void hash_foreach(struct vcpu *v, /* Say we're here, to stop hash-lookups reordering the chains */ ASSERT(shadow_locked_by_me(d)); - ASSERT(d->arch.paging.shadow.hash_table); ASSERT(d->arch.paging.shadow.hash_walking == 0); d->arch.paging.shadow.hash_walking = 1; @@ -3450,12 +3449,6 @@ shadow_write_p2m_entry(struct vcpu *v, unsigned long gfn, shadow_lock(d); - if ( unlikely(d->is_dying) ) - { - shadow_unlock(d); - return; - } - /* If we're removing an MFN from the p2m, remove it from the shadows too */ if ( level == 1 ) { -- 2.30.2